From 7ea0b673b9bd21382cfcba0994396ed9730760eb Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 30 Mar 2006 15:16:40 +0000 Subject: [PATCH] New upstream release candidate 3.09.2+rc1. --- debian/changelog | 11 +++++++---- debian/copyright.in | 5 ++--- debian/patches/00list | 4 ++-- debian/rules | 4 ++-- debian/svn-deblayout | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index c6cff54a..9852a61d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,20 @@ -ocaml (3.09.1-4) UNRELEASED; urgency=low +ocaml (3.09.1+3.09.2rc1-1) experimental; urgency=low [ Julien Cristau ] * Remove dh_gencontrol line for ocaml-source from the binary-arch target (ocaml-source is built in binary-indep). - * Add patch from upstream to fix handling of `new' in camlp4 - (Closes: #355651). + * New upstream release candidate: + + add support for GNU/Hurd (Closes: #358274). + + fix handling of `new' in camlp4 which caused stack overflow (Closes: + #355651). + * Drop kbsd-gnu.dpatch, obsolete. [ Samuel Mimram ] * Use new icon, closes: #358946. * Link to README.Debian instead of README.Debian.gz in /usr/share/doc/ocaml-base, closes: #355975. - -- Samuel Mimram Sat, 25 Mar 2006 13:52:14 +0000 + -- Julien Cristau Thu, 30 Mar 2006 15:10:14 +0200 ocaml (3.09.1-3) unstable; urgency=low diff --git a/debian/copyright.in b/debian/copyright.in index 2383f444..4fb5ae62 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -1,9 +1,8 @@ This package was debianized by Sven Luther on Fri, 14 Dec 2001 12:44:03 +0100. -It was downloaded from - - http://caml.inria.fr/pub/distrib/ocaml-#OcamlMAJOR#/ocaml-#OcamlABI#.tar.gz +It was downloaded from :pserver:anoncvs@camlcvs.inria.fr/caml +(module ocaml, tag ocaml3092rc1). Upstream Authors: Xavier Leroy, Jerome Vouillon and Damien Doligez Upstream Author for the camlp4 part: Daniel de Rauglaudre diff --git a/debian/patches/00list b/debian/patches/00list index 64990b6a..f2583a23 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,7 +2,7 @@ versioned_libdir objinfo dumpobj man-ocamlmklib -kbsd-gnu +#kbsd-gnu alpha_ld_no-relax call_ld_with_proper_flags -pr_o +#pr_o diff --git a/debian/rules b/debian/rules index c9c76609..4758107c 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/dpatch/dpatch.make PACKAGE = ocaml OCAMLMAJOR = 3.09 -OCAMLMINOR = 1 +OCAMLMINOR = 2+rc1 OCAMLABI = $(OCAMLMAJOR).$(OCAMLMINOR) STDLIBDIR = /usr/lib/ocaml/$(OCAMLABI) MD5SUMSDIR = /var/lib/ocaml/md5sums @@ -53,7 +53,7 @@ debian/control: # Generate list of files ocaml-source. # Should never be called automatically. debian/ocaml-source.files: - tar ztf ../upstream/ocaml_3.09.1.orig.tar.gz | cut -d/ -f2- | grep -v ^$$ | grep -v .*/$$ | grep -v .cvsignore > debian/ocaml-source.files + tar ztf ../upstream/ocaml_3.09.1+3.09.2rc1.orig.tar.gz | cut -d/ -f2- | grep -v ^$$ | grep -v .*/$$ | grep -v .cvsignore > debian/ocaml-source.files config-stamp: configure abi-sed diff --git a/debian/svn-deblayout b/debian/svn-deblayout index f7696e3c..99b5d915 100644 --- a/debian/svn-deblayout +++ b/debian/svn-deblayout @@ -1,3 +1,3 @@ -origDir=../upstream +origDir=../../upstream origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml/upstream tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml -- 2.30.2